Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 04:45:16 +0000 (20:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 04:45:16 +0000 (20:45 -0800)

Trivial merge